Make GtkModelButton public

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f60bec87a7f3c91aaab13113c4ea6fedfacd6a53..56bb75549bdf5c7fde3719dbe9c6557e2930a45a 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -393,6 +393,7 @@ gtk_public_h_sources =              \
        gtkmenushell.h          \
        gtkmenutoolbutton.h     \
        gtkmessagedialog.h      \
+       gtkmodelbutton.h        \
        gtkmodules.h            \
        gtkmountoperation.h     \
        gtknotebook.h           \
@@ -624,7 +625,6 @@ gtk_private_h_sources =             \
        gtkmenutrackeritem.h    \
        gtkmnemonichash.h       \
        gtkmodelmenuitem.h      \
-       gtkmodelbutton.h        \
        gtkmodifierstyle.h      \
        gtkmodulesprivate.h     \
        gtkmountoperationprivate.h \

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 5955dd90bba37010efa60fde5a3835341b44fab9..de87728784a53214b2af0b9c642e00c199692a88 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -141,6 +141,7 @@
 #include <gtk/gtkmenushell.h>
 #include <gtk/gtkmenutoolbutton.h>
 #include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkmodelbutton.h>
 #include <gtk/gtkmodules.h>
 #include <gtk/gtkmountoperation.h>
 #include <gtk/gtknotebook.h>

diff --git a/gtk/gtkmodelbutton.h b/gtk/gtkmodelbutton.h
index b3963baeb108bb3e789e7e6c91218e282eef73d0..c993ce4b07ea9f029fdeca4455be2f02f4d726e8 100644 (file)
--- a/gtk/gtkmodelbutton.h
+++ b/gtk/gtkmodelbutton.h
@@ -20,6 +20,10 @@
 #ifndef __GTK_MODEL_BUTTON_H__
 #define __GTK_MODEL_BUTTON_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
@@ -32,8 +36,10 @@ G_BEGIN_DECLS
 
 typedef struct _GtkModelButton                            GtkModelButton;
 
+GDK_AVAILABLE_IN_3_16
 GType                   gtk_model_button_get_type                    (void) G_GNUC_CONST;
 
+GDK_AVAILABLE_IN_3_16
 GtkWidget *             gtk_model_button_new                         (void);
 
 G_END_DECLS